From: Stuart Prescott Date: Sat, 28 Mar 2026 06:12:32 +0000 (+1100) Subject: Add patch to correct Python module paths in cmake files X-Git-Tag: archive/raspbian/6.10.3-2+rpi1^2~23 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c7631fbd0bc5a968294ea70de2dc6edb6ff3baa4;p=pyside6.git Add patch to correct Python module paths in cmake files --- diff --git a/debian/patches/0011-Use-correct-Python-module-paths-in-cmake-files.patch b/debian/patches/0011-Use-correct-Python-module-paths-in-cmake-files.patch new file mode 100644 index 00000000..6d11bbb9 --- /dev/null +++ b/debian/patches/0011-Use-correct-Python-module-paths-in-cmake-files.patch @@ -0,0 +1,31 @@ +From: Stuart Prescott +Date: Sat, 28 Mar 2026 17:10:38 +1100 +Subject: Use correct Python module paths in cmake files + +--- + sources/shiboken6/data/Shiboken6ToolsConfig.cmake.in | 11 ++--------- + 1 file changed, 2 insertions(+), 9 deletions(-) + +diff --git a/sources/shiboken6/data/Shiboken6ToolsConfig.cmake.in b/sources/shiboken6/data/Shiboken6ToolsConfig.cmake.in +index fdc8e6d..afb8903 100644 +--- a/sources/shiboken6/data/Shiboken6ToolsConfig.cmake.in ++++ b/sources/shiboken6/data/Shiboken6ToolsConfig.cmake.in +@@ -7,16 +7,9 @@ if(NOT CMAKE_CROSSCOMPILING) + find_dependency(Python COMPONENTS Interpreter Development.Module) + + if(NOT SHIBOKEN6TOOLS_SKIP_FIND_DEPENDENCIES) +- # Dynamically determine Python_SITELIB using Python itself +- execute_process( +- COMMAND ${Python_EXECUTABLE} -c +- "import site; print(next(p for p in site.getsitepackages() if 'site-packages' in p))" +- OUTPUT_VARIABLE Python_SITELIB +- OUTPUT_STRIP_TRAILING_WHITESPACE +- ) + list(APPEND CMAKE_PREFIX_PATH +- "${Python_SITELIB}/shiboken6/lib/cmake" +- "${Python_SITELIB}/PySide6/lib/cmake" ++ "/usr/lib/python3/dist-packages/shiboken6/lib/cmake" ++ "/usr/lib/python3/dist-packages/PySide6/lib/cmake" + ) + find_dependency(Shiboken6 REQUIRED) + find_dependency(PySide6 REQUIRED) diff --git a/debian/patches/series b/debian/patches/series index 206b353f..70eebd47 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ 0008-XFAIL-QtQml-qquickitem_grabToImage.patch 0009-Fix-python-module-paths-in-CMake.patch 0010-Remove-dependency-from-shiboken6_generator.patch +0011-Use-correct-Python-module-paths-in-cmake-files.patch